Sākums Izpētīt Palīdzība
Reģistrēties Pierakstīties
CarePatch
/
thermometer
Vērot 2
Pievienot zvaigznīti 0
Atdalīts 0

Pārlūkot izejas kodu
:art: Remove comment codes

huangqimin001 3 gadi atpakaļ
vecāks
a28a3af874
revīzija
2245fadf06
1 mainītis faili ar 1 papildinājumiem un 104 dzēšanām
Rādīt salīdzināšanas statistiku
  1. 1 104
      api/eqpt_views.py

+ 1 - 104
api/eqpt_views.py
Parādīt failu 

@@ -13,7 +13,7 @@ from paginator import pagination
13 13 
 from TimeConvert import TimeConvert as tc
14 14
15 15 
 from equipment.models import (IsolationPointInfo, IsolationPointUserInfo, ThermometerEquipmentInfo,
16 
-                              ThermometerMeasureInfo, ThermometerMeasureLogInfo)
16 
+                              ThermometerMeasureLogInfo)
17 17 
 from utils.error.errno_utils import IsolationPointStatusCode, ThermometerEquipmentStatusCode
18 18 
 from utils.redis.rscreen import get_screen_info, set_screen_info
19 19 
 
@@ -27,46 +27,12 @@ def eqpt_bind(request):
27 27
28 28 
     macidsns = macidsns or [{'macid': macid, 'sn': sn}]
29 29
30 
-    # headers = {
31 
-    #     'Content-Type': 'application/json',
32 
-    #     'Partner-Identifier': 'yingduo',
33 
-    #     'Partner-Token': '9A79C0E34C72B4D0F9B5EA0C59FFC52A',
34 
-    # }
35 
-
36 30 
     for macidsn in macidsns:
37 31 
         macid, sn = macidsn.get('macid'), macidsn.get('sn')
38 32
39 
-        # data = {
40 
-        #     'mac': macid,
41 
-        #     'callback': 'http://twjc.kodo.com.cn/api/upload/temperature',
42 
-        # }
43 
-        # # 设备注册成功
44 
-        # # {
45 
-        # #     "ret": "SUCCESS",
46 
-        # #     "data": {
47 
-        # #         "id": 6,
48 
-        # #         "callback": "http://twjc.kodo.com.cn/api/upload/temperature",
49 
-        # #         "mac": "C4:64:E3:7A:EF:A8"
50 
-        # #     },
51 
-        # #     "debug": ""
52 
-        # # }
53 
-        # #
54 
-        # # 设备注册失败
55 
-        # # {
56 
-        # #     "ret": "FAIL",
57 
-        # #     "data": "该设备已被注册！",
58 
-        # #     "debug": ""
59 
-        # # }
60 
-        # try:
61 
-        #     result = requests.post('http://www.protontek.com/vcare-api/open/device/register', headers=headers, data=json.dumps(data)).json()
62 
-        # except Exception as e:
63 
-        #     result = {'message': e.args}
64 
-
65 33 
         ThermometerEquipmentInfo.objects.update_or_create(macid=macid, defaults={
66 34 
             'point_id': point_id,
67 35 
             'sn': sn,
68 
-            # 'eqpt_register_status': int(result.get('ret') == 'SUCCESS' or result.get('data') == '该设备已被注册！'),
69 
-            # 'eqpt_register_result': result,
70 36 
         })
71 37
72 38 
     return response()
 
@@ -301,49 +267,6 @@ def screen_eqpt_result(request):
301 267
302 268 
 @logit
303 269 
 def upload_temperature(request):
304 
-    # request.POST = request.POST or json.loads(request.body)
305 
-    # macid = request.POST.get('mac', '')
306 
-    # name = request.POST.get('name', '')
307 
-    # sex = request.POST.get('gender', 0)
308 
-    # birth_stamp = request.POST.get('birthday', 0)
309 
-    # age = request.POST.get('age', 0)
310 
-    # phone = request.POST.get('mobile', '')
311 
-    # start_stamp = request.POST.get('startTime', 0)
312 
-    # end_stamp = request.POST.get('endTime', 0)
313 
-    # temperature = round(float(request.POST.get('maxTempValue', 0)), 2)
314 
-    #
315 
-    # try:
316 
-    #     eqpt = ThermometerEquipmentInfo.objects.get(macid=macid, status=True)
317 
-    # except ThermometerEquipmentInfo.DoesNotExist:
318 
-    #     ThermometerMeasureLogInfo.objects.create(macid=macid, name=name, sex=sex, birth_stamp=birth_stamp, phone=phone, start_stamp=start_stamp, end_stamp=end_stamp, temperature=temperature, upload_temperature_info=request.POST, status=False)
319 
-    #     return response(ThermometerEquipmentStatusCode.THERMOMETER_EQUIPMENT_NOT_FOUND)
320 
-    #
321 
-    # try:
322 
-    #     point = IsolationPointInfo.objects.get(point_id=eqpt.point_id, status=True)
323 
-    # except IsolationPointInfo.DoesNotExist:
324 
-    #     return response(IsolationPointStatusCode.ISOLATIONPOINT_NOT_FOUND)
325 
-    #
326 
-    # point_measure_ymd = tc.local_string(format='%Y-%m-%d')
327 
-    # point_measure_window = point.current_measure_window
328 
-    #
329 
-    # eqpt.name = name
330 
-    # eqpt.sex = sex
331 
-    # eqpt.birth_stamp = birth_stamp
332 
-    # eqpt.age = stamp2age(birth_stamp)
333 
-    # eqpt.phone = phone
334 
-    # eqpt.last_submit_at = tc.utc_datetime()
335 
-    # eqpt.save()
336 
-    #
337 
-    # ThermometerMeasureLogInfo.objects.create(point_id=eqpt.point_id, macid=macid, name=name, sex=sex, birth_stamp=birth_stamp, phone=phone, start_stamp=start_stamp, end_stamp=end_stamp, temperature=temperature, upload_temperature_info=request.POST)
338 
-    #
339 
-    # if point_measure_window:
340 
-    #     measure_info, _ = ThermometerMeasureInfo.objects.get_or_create(point_id=eqpt.point_id, point_measure_ymd=point_measure_ymd, point_measure_window=point_measure_window, macid=macid, defaults={
341 
-    #         'temperature': temperature,
342 
-    #     })
343 
-    #     if temperature > measure_info.temperature:
344 
-    #         measure_info.temperature = temperature
345 
-    #         measure_info.save()
346 
-
347 270 
     return response()
348 271
349 272 
 
@@ -395,34 +318,8 @@ def mqtt_upload_temperature(payload):
395 318 
     except IsolationPointInfo.DoesNotExist:
396 319 
         return
397 320
398 
-    # point_measure_ymd = tc.local_string(format='%Y-%m-%d')
399 
-
400 
-    # point_measure_window = point.current_measure_window
401 
-    # eqpt.last_submit_at = tc.utc_datetime()
402 
-    # eqpt.save()
403 
-
404 321 
     ThermometerMeasureLogInfo.objects.create(point_id=eqpt.point_id, macid=macid, start_stamp=start_stamp, end_stamp=end_stamp, temperature=temperature, temperature_src=ThermometerMeasureLogInfo.MQTT, upload_temperature_info=payload)
405 322
406 
-    # if point_measure_window:
407 
-    #     measure_info, _ = ThermometerMeasureInfo.objects.get_or_create(point_id=eqpt.point_id, point_measure_ymd=point_measure_ymd, point_measure_window=point_measure_window, macid=macid, defaults={
408 
-    #         'temperature': temperature,
409 
-    #     })
410 
-    #     if temperature > measure_info.temperature:
411 
-    #         measure_info.temperature = temperature
412 
-    #         measure_info.save()
413 
-    #
414 
-    #         set_old_temperature(eqpt.point_id, macid, temperature)
415 
-    #
416 
-    #     try:
417 
-    #         ipui = IsolationPointUserInfo.objects.get(pk=eqpt.ipui_pk)
418 
-    #     except IsolationPointUserInfo.DoesNotExist:
419 
-    #         ipui = None
420 
-    #     if ipui:
421 
-    #         ipui.observed_ymds = list(set(ipui.observed_ymds + [point_measure_ymd]))
422 
-    #         ipui.observed_days = len(ipui.observed_ymds)
423 
-    #         ipui.last_submit_at = tc.utc_datetime()
424 
-    #         ipui.save()
425 
-
426 323 
     try:
427 324 
         ipui = IsolationPointUserInfo.objects.get(pk=eqpt.ipui_pk)
428 325 
     except IsolationPointUserInfo.DoesNotExist: